popupMenu: Always use a PopupMenuItem

By this point, we'll know we'll always have a PopupMenuItem.

https://bugzilla.gnome.org/show_bug.cgi?id=698427

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 041434eac68492f0d148c9ab8e75106e1a1e3b17..b9d6e83506bec6b9f91b2cb10b1e25632fc41c09 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1860,7 +1860,9 @@ const RemoteMenu = new Lang.Class({
                                          items: [ ],
                                        };
         let action = this._actions[action_id];
-        let item, target, destroyId, specificSignalId;
+        let target, destroyId, specificSignalId;
+
+        let item = new PopupMenuItem(label);
 
         if (action.state) {
             // Docs have get_state_hint(), except that the DBus protocol
@@ -1869,8 +1871,6 @@ const RemoteMenu = new Lang.Class({
             // always returns null
             // Funny :)
 
-            item = new PopupMenuItem(label);
-
             switch (String.fromCharCode(action.state.classify())) {
             case 'b':
                 action.items.push(item);
@@ -1895,7 +1895,6 @@ const RemoteMenu = new Lang.Class({
             }
         } else {
             target = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_TARGET, null);
-            item = new PopupMenuItem(label);
             action.items.push(item);
             specificSignalId = item.connect('activate', Lang.bind(this, function() {
                 this.actionGroup.activate_action(action_id, target);